[AWS] [S3] fix: improve object size metric calculation #41755
+84
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kavindu-Dodan
added
bug
Team:obs-ds-hosted-services
|
Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services) |
botelastic
bot
added
needs_team
Signed-off-by: Kavindu Dodanduwa <[email protected]>
Signed-off-by: Kavindu Dodanduwa <[email protected]>
Signed-off-by: Kavindu Dodanduwa <[email protected]>
Kavindu-Dodan
force-pushed
the
fix/improve-object-size-metric-calculation
branch
from
78c0c74
to
04531f3
Compare
Signed-off-by: Kavindu Dodanduwa <[email protected]>
Kavindu-Dodan
commented
Nov 22, 2024
| @@ -36,7 +36,7 @@ func init() { | |||
| // currentTime returns the current time. This exists to allow unit tests | |||
| // simulate the passage of time. | |||
| func currentTime() time.Time { | |||
| clock := clockValue.Load().(clock) | |||
| clock, _ := clockValue.Load().(clock) | |||
There was a problem hiding this comment.
nit - had to fix this to get lint correct
andrewkroh
reviewed
Nov 22, 2024
Comment on lines
212
to
+214
| totalBytesRead *monitoring.Uint | ||
|
|
||
| trackBytes int64 |
There was a problem hiding this comment.
I think the naming could be more clear. "trackBytes" does not mean much to me. Maybe...
totalBytesReadMetric *monitoring.Uint
totalBytesRead int64
| return n, err | ||
| } | ||
|
|
||
| func (m *monitoredReader) GetTrackedBytes() int64 { |
There was a problem hiding this comment.
The accessor seems unnecessary. The caller can read straight from the field.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed commit message
This fixes a bug with Cloudflare logpush integration, which uses the S3 input.
#40775 introduced a feature introducing s3_object_size_in_bytes histogram. Internally it utilized S3 SDK's GetObjectOutput instances' ContentLength property 1. In code level (SDK internally), this is derived using Content-Length header 2.
It seems that Cloudflare R2 (API compatible with S3) could omit Content-Length header 3. Hence, I have improved how we derive the
s3_object_size_in_bytesmetric by avoiding using Content-Length backed method.Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
Screenshots
See metric comparison with proposed collection method (before removing content length usage). Tracked total bytes are same as content length.
Handling validated for gzip
Handling validated for plain text
Footnotes
https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html#API_GetObject_ResponseSyntax ↩
https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.60.1/service/s3/deserializers.go#L5477-L5484 ↩
https://community.cloudflare.com/t/no-content-length-header-when-serving-plaintext-from-r2/565521 ↩